Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Wed, 22 Nov 2017 12:28:58 +0000 (07:28 -0500)
committerTom Rini <[email protected]>
Wed, 22 Nov 2017 12:28:58 +0000 (07:28 -0500)

Trivial merge